From 87c6ae1c186029872c9ffa01ba728faf7098c1d8 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 5 Nov 2015 07:44:29 -0500
Subject: [PATCH] Adwaita: Update searchbar styling

Adapt to the changes in the previous commit.
---
 gtk/theme/Adwaita/_common.scss           | 23 ++++------
 gtk/theme/Adwaita/gtk-contained-dark.css | 58 +++++++++++++-----------
 gtk/theme/Adwaita/gtk-contained.css      | 58 +++++++++++++-----------
 3 files changed, 70 insertions(+), 69 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 47c5757e5e..cdbfd137a7 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1035,7 +1035,8 @@ toolbar {
   padding: 3px;
   border-radius: 0  0 5px 5px;
 }
-.search-bar, .location-bar {
+searchbar,
+.location-bar {
   @extend toolbar;
   @extend %inset-bar;
   border-width: 0 0 1px;
@@ -2495,10 +2496,11 @@ frame,
   &.flat { border-style: none; }
   &:backdrop { border-color: $backdrop_borders_color; }
   padding: 0;
-  &.action-bar {
-    padding: 6px;
-    border-width: 1px 0 0;
-  }
+}
+
+actionbar frame {
+  padding: 6px;
+  border-width: 1px 0 0;
 }
 
 scrolledwindow {
@@ -2568,7 +2570,7 @@ separator {
   color: transparentize(black, 0.9);
 
   // Font and File button separators
-  GtkFileChooserButton &.vertical,
+  button.file &.vertical,
   button.font &.vertical {
     // always disable separators
     -GtkWidget-wide-separators: true;
@@ -2864,15 +2866,6 @@ messagedialog { // Message Dialog styling
 }
 
 GtkFileChooserDialog {
-  .search-bar {
-    background-color: $base_color;
-    border-color: $bg_color;
-    box-shadow: none;
-    &:backdrop {
-      background-color: $backdrop_base_color;
-      border-color: $backdrop_bg_color;
-    }
-  }
   .dialog-action-box {
     border-top: 1px solid $borders_color;
     &:backdrop { border-top-color: $backdrop_borders_color; }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 9b9cd37288..19b7d02444 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1058,10 +1058,11 @@ button, headerbar button.titlebutton,
     .inline-toolbar toolbutton > button:backdrop:insensitive:active > .label, .inline-toolbar toolbutton > button:backdrop:insensitive:checked > .label {
       color: inherit; }
 
-toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, .inline-toolbar.search-bar toolbutton > button.flat, .inline-toolbar.location-bar toolbutton > button.flat, .inline-toolbar toolbutton > .sidebar-button.button, .inline-toolbar headerbar toolbutton > button.titlebutton, headerbar .inline-toolbar toolbutton > button.titlebutton,
+toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat,
+.inline-toolbar.location-bar toolbutton > button.flat, .inline-toolbar toolbutton > .sidebar-button.button, .inline-toolbar headerbar toolbutton > button.titlebutton, headerbar .inline-toolbar toolbutton > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop > button.flat,
 .inline-toolbar toolbutton:backdrop > button.flat,
-.inline-toolbar.search-bar toolbutton:backdrop > button.flat,
+searchbar.inline-toolbar toolbutton:backdrop > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop > button.flat,
 .inline-toolbar toolbutton:backdrop > .sidebar-button.button,
 .inline-toolbar headerbar toolbutton:backdrop > button.titlebutton,
@@ -1075,12 +1076,13 @@ headerbar .inline-toolbar toolbutton:backdrop > button.titlebutton,
   border-right-style: none; }
 
 .linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, headerbar .linked > button.titlebutton:first-child,
-.titlebar .linked > button.titlebutton:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar.search-bar toolbutton:first-child > button.flat, .inline-toolbar.location-bar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > .sidebar-button.button, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
+.titlebar .linked > button.titlebutton:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
+.inline-toolbar.location-bar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > .sidebar-button.button, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:first-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:first-child > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat,
 .inline-toolbar toolbutton:backdrop:first-child > button.flat,
-.inline-toolbar.search-bar toolbutton:backdrop:first-child > button.flat,
+searchbar.inline-toolbar toolbutton:backdrop:first-child > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop:first-child > button.flat,
 .inline-toolbar toolbutton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar headerbar toolbutton:backdrop:first-child > button.titlebutton,
@@ -1090,12 +1092,13 @@ headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
 .linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, headerbar .linked > button.titlebutton:last-child,
-.titlebar .linked > button.titlebutton:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar.search-bar toolbutton:last-child > button.flat, .inline-toolbar.location-bar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > .sidebar-button.button, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
+.titlebar .linked > button.titlebutton:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
+.inline-toolbar.location-bar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > .sidebar-button.button, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:last-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:last-child > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat,
 .inline-toolbar toolbutton:backdrop:last-child > button.flat,
-.inline-toolbar.search-bar toolbutton:backdrop:last-child > button.flat,
+searchbar.inline-toolbar toolbutton:backdrop:last-child > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop:last-child > button.flat,
 .inline-toolbar toolbutton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar headerbar toolbutton:backdrop:last-child > button.titlebutton,
@@ -1106,12 +1109,13 @@ headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
 .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, headerbar .linked > button.titlebutton:only-child,
-.titlebar .linked > button.titlebutton:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar.search-bar toolbutton:only-child > button.flat, .inline-toolbar.location-bar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > .sidebar-button.button, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
+.titlebar .linked > button.titlebutton:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
+.inline-toolbar.location-bar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > .sidebar-button.button, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:only-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:only-child > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat,
 .inline-toolbar toolbutton:backdrop:only-child > button.flat,
-.inline-toolbar.search-bar toolbutton:backdrop:only-child > button.flat,
+searchbar.inline-toolbar toolbutton:backdrop:only-child > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop:only-child > button.flat,
 .inline-toolbar toolbutton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar headerbar toolbutton:backdrop:only-child > button.titlebutton,
@@ -1482,11 +1486,14 @@ combobox {
 /************
  * Toolbars *
  ************/
-toolbar, .inline-toolbar, .search-bar, .location-bar {
+toolbar, .inline-toolbar, searchbar,
+.location-bar {
   -GtkWidget-window-dragging: true;
   padding: 4px;
   background-color: #393f3f; }
-  .osd toolbar, .osd .inline-toolbar, .osd .search-bar, .osd .location-bar, toolbar.osd, .osd.inline-toolbar, .osd.search-bar, .osd.location-bar {
+  .osd toolbar, .osd .inline-toolbar, .osd searchbar,
+  .osd .location-bar, toolbar.osd, .osd.inline-toolbar, searchbar.osd,
+  .osd.location-bar {
     padding: 13px;
     border: none;
     border-radius: 5px;
@@ -1497,16 +1504,19 @@ toolbar, .inline-toolbar, .search-bar, .location-bar {
   padding: 3px;
   border-radius: 0  0 5px 5px; }
 
-.search-bar, .location-bar {
+searchbar,
+.location-bar {
   border-width: 0 0 1px;
   padding: 3px; }
 
-.inline-toolbar, .search-bar, .location-bar {
+.inline-toolbar, searchbar,
+.location-bar {
   border-style: solid;
   border-color: #1c1f1f;
   background-color: #303535;
   box-shadow: inset 0 2px 3px -1px #242828, 0 1px rgba(238, 238, 236, 0.1); }
-  .inline-toolbar:backdrop, .search-bar:backdrop, .location-bar:backdrop {
+  .inline-toolbar:backdrop, searchbar:backdrop,
+  .location-bar:backdrop {
     border-color: #1f2222;
     background-color: #303535;
     box-shadow: none; }
@@ -2064,8 +2074,9 @@ popover {
   popover > .view,
   popover > toolbar,
   popover > .inline-toolbar,
-  popover > .search-bar,
-  popover > .location-bar, popover.osd > toolbar, popover.osd > .inline-toolbar, popover.osd > .search-bar, popover.osd > .location-bar {
+  popover > searchbar,
+  popover > .location-bar, popover.osd > toolbar, popover.osd > .inline-toolbar, popover.osd > searchbar,
+  popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
   popover button.flat, popover .sidebar-button.button, popover headerbar button.titlebutton, headerbar popover button.titlebutton,
@@ -3496,10 +3507,10 @@ frame,
   frame:backdrop,
   .frame:backdrop {
     border-color: #1f2222; }
-  frame.action-bar,
-  .frame.action-bar {
-    padding: 6px;
-    border-width: 1px 0 0; }
+
+actionbar frame {
+  padding: 6px;
+  border-width: 1px 0 0; }
 
 scrolledwindow viewport.frame {
   border-style: none; }
@@ -3619,7 +3630,7 @@ scrolledwindow junction {
 
 separator {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton separator.vertical, button.font separator.vertical {
+  button.file separator.vertical, button.font separator.vertical {
     -GtkWidget-wide-separators: true; }
 
 /*********
@@ -4068,13 +4079,6 @@ messagedialog.csd .dialog-action-area button:first-child {
   border-bottom-left-radius: 7px;
   outline-bottom-left-radius: 5px; }
 
-GtkFileChooserDialog .search-bar {
-  background-color: #292929;
-  border-color: #393f3f;
-  box-shadow: none; }
-  GtkFileChooserDialog .search-bar:backdrop {
-    background-color: #2c2c2c;
-    border-color: #393f3f; }
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #1c1f1f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index b09c6ab70d..2e5f5fb17c 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1058,10 +1058,11 @@ button, headerbar button.titlebutton,
     .inline-toolbar toolbutton > button:backdrop:insensitive:active > .label, .inline-toolbar toolbutton > button:backdrop:insensitive:checked > .label {
       color: inherit; }
 
-toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, .inline-toolbar.search-bar toolbutton > button.flat, .inline-toolbar.location-bar toolbutton > button.flat, .inline-toolbar toolbutton > .sidebar-button.button, .inline-toolbar headerbar toolbutton > button.titlebutton, headerbar .inline-toolbar toolbutton > button.titlebutton,
+toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat,
+.inline-toolbar.location-bar toolbutton > button.flat, .inline-toolbar toolbutton > .sidebar-button.button, .inline-toolbar headerbar toolbutton > button.titlebutton, headerbar .inline-toolbar toolbutton > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop > button.flat,
 .inline-toolbar toolbutton:backdrop > button.flat,
-.inline-toolbar.search-bar toolbutton:backdrop > button.flat,
+searchbar.inline-toolbar toolbutton:backdrop > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop > button.flat,
 .inline-toolbar toolbutton:backdrop > .sidebar-button.button,
 .inline-toolbar headerbar toolbutton:backdrop > button.titlebutton,
@@ -1075,12 +1076,13 @@ headerbar .inline-toolbar toolbutton:backdrop > button.titlebutton,
   border-right-style: none; }
 
 .linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, headerbar .linked > button.titlebutton:first-child,
-.titlebar .linked > button.titlebutton:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar.search-bar toolbutton:first-child > button.flat, .inline-toolbar.location-bar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > .sidebar-button.button, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
+.titlebar .linked > button.titlebutton:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
+.inline-toolbar.location-bar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > .sidebar-button.button, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:first-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:first-child > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat,
 .inline-toolbar toolbutton:backdrop:first-child > button.flat,
-.inline-toolbar.search-bar toolbutton:backdrop:first-child > button.flat,
+searchbar.inline-toolbar toolbutton:backdrop:first-child > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop:first-child > button.flat,
 .inline-toolbar toolbutton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar headerbar toolbutton:backdrop:first-child > button.titlebutton,
@@ -1090,12 +1092,13 @@ headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
 .linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, headerbar .linked > button.titlebutton:last-child,
-.titlebar .linked > button.titlebutton:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar.search-bar toolbutton:last-child > button.flat, .inline-toolbar.location-bar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > .sidebar-button.button, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
+.titlebar .linked > button.titlebutton:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
+.inline-toolbar.location-bar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > .sidebar-button.button, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:last-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:last-child > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat,
 .inline-toolbar toolbutton:backdrop:last-child > button.flat,
-.inline-toolbar.search-bar toolbutton:backdrop:last-child > button.flat,
+searchbar.inline-toolbar toolbutton:backdrop:last-child > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop:last-child > button.flat,
 .inline-toolbar toolbutton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar headerbar toolbutton:backdrop:last-child > button.titlebutton,
@@ -1106,12 +1109,13 @@ headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
 .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, headerbar .linked > button.titlebutton:only-child,
-.titlebar .linked > button.titlebutton:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar.search-bar toolbutton:only-child > button.flat, .inline-toolbar.location-bar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > .sidebar-button.button, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
+.titlebar .linked > button.titlebutton:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
+.inline-toolbar.location-bar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > .sidebar-button.button, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:only-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:only-child > button.titlebutton,
 toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat,
 .inline-toolbar toolbutton:backdrop:only-child > button.flat,
-.inline-toolbar.search-bar toolbutton:backdrop:only-child > button.flat,
+searchbar.inline-toolbar toolbutton:backdrop:only-child > button.flat,
 .inline-toolbar.location-bar toolbutton:backdrop:only-child > button.flat,
 .inline-toolbar toolbutton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar headerbar toolbutton:backdrop:only-child > button.titlebutton,
@@ -1482,11 +1486,14 @@ combobox {
 /************
  * Toolbars *
  ************/
-toolbar, .inline-toolbar, .search-bar, .location-bar {
+toolbar, .inline-toolbar, searchbar,
+.location-bar {
   -GtkWidget-window-dragging: true;
   padding: 4px;
   background-color: #ededed; }
-  .osd toolbar, .osd .inline-toolbar, .osd .search-bar, .osd .location-bar, toolbar.osd, .osd.inline-toolbar, .osd.search-bar, .osd.location-bar {
+  .osd toolbar, .osd .inline-toolbar, .osd searchbar,
+  .osd .location-bar, toolbar.osd, .osd.inline-toolbar, searchbar.osd,
+  .osd.location-bar {
     padding: 13px;
     border: none;
     border-radius: 5px;
@@ -1497,16 +1504,19 @@ toolbar, .inline-toolbar, .search-bar, .location-bar {
   padding: 3px;
   border-radius: 0  0 5px 5px; }
 
-.search-bar, .location-bar {
+searchbar,
+.location-bar {
   border-width: 0 0 1px;
   padding: 3px; }
 
-.inline-toolbar, .search-bar, .location-bar {
+.inline-toolbar, searchbar,
+.location-bar {
   border-style: solid;
   border-color: #a1a1a1;
   background-color: #d6d6d6;
   box-shadow: inset 0 2px 3px -1px #b6b6b6, 0 1px white; }
-  .inline-toolbar:backdrop, .search-bar:backdrop, .location-bar:backdrop {
+  .inline-toolbar:backdrop, searchbar:backdrop,
+  .location-bar:backdrop {
     border-color: darkgray;
     background-color: #d5d5d5;
     box-shadow: none; }
@@ -2070,8 +2080,9 @@ popover {
   popover > .view,
   popover > toolbar,
   popover > .inline-toolbar,
-  popover > .search-bar,
-  popover > .location-bar, popover.osd > toolbar, popover.osd > .inline-toolbar, popover.osd > .search-bar, popover.osd > .location-bar {
+  popover > searchbar,
+  popover > .location-bar, popover.osd > toolbar, popover.osd > .inline-toolbar, popover.osd > searchbar,
+  popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
   popover button.flat, popover .sidebar-button.button, popover headerbar button.titlebutton, headerbar popover button.titlebutton,
@@ -3658,10 +3669,10 @@ frame,
   frame:backdrop,
   .frame:backdrop {
     border-color: darkgray; }
-  frame.action-bar,
-  .frame.action-bar {
-    padding: 6px;
-    border-width: 1px 0 0; }
+
+actionbar frame {
+  padding: 6px;
+  border-width: 1px 0 0; }
 
 scrolledwindow viewport.frame {
   border-style: none; }
@@ -3781,7 +3792,7 @@ scrolledwindow junction {
 
 separator {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton separator.vertical, button.font separator.vertical {
+  button.file separator.vertical, button.font separator.vertical {
     -GtkWidget-wide-separators: true; }
 
 /*********
@@ -4240,13 +4251,6 @@ messagedialog.csd .dialog-action-area button:first-child {
   border-bottom-left-radius: 7px;
   outline-bottom-left-radius: 5px; }
 
-GtkFileChooserDialog .search-bar {
-  background-color: #ffffff;
-  border-color: #ededed;
-  box-shadow: none; }
-  GtkFileChooserDialog .search-bar:backdrop {
-    background-color: white;
-    border-color: #ededed; }
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #a1a1a1; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-- 
2.30.2